Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 16 May 2010 00:18:09 +0000 (00:18 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 16 May 2010 00:18:09 +0000 (00:18 +0000)
commit08adcb4cf60f123c0f49d5477a04e9f688dcccbf
treed67a19d93ee76c489754329379e8026d0c883134
parentcc2a65b68b708658fb32c181169ba7bbb09cb1a7
parentaca62d8dc8a0f76c76946139a0d3c2a38f6baa72
Merge from mainline.